t / t4135 / diff-with spaces.diffon commit checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore (c1d7036)
   1--- post image.txt.orig 2010-08-18 20:13:31.544002255 -0500
   2+++ post image.txt      2010-08-18 20:13:31.544002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage